guard against child removal in row-expanded callback. (#366782, John

2006-10-29  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtktreeview.c (gtk_tree_view_real_expand_row): guard against
	child removal in row-expanded callback. (#366782, John Ellis).

diff --git a/ChangeLog b/ChangeLog
index 57c0edbd1405107804ad48e6353a7e6c043aadcf..53369be6529f556d8002cebea8b044c34d4dd496 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-29  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_real_expand_row): guard against
+       child removal in row-expanded callback. (#366782, John Ellis).
+
 2006-10-29  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkwindow-win32.c (RegisterGdkClass): Improve handling

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index ba64daa0db10509275945f47d7cde3ac05c07d7f..0e177273e0d04d3271dc6cb3d49845b88b0ab53e 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -11778,7 +11778,7 @@ gtk_tree_view_real_expand_row (GtkTreeView *tree_view,
   install_presize_handler (tree_view);
 
   g_signal_emit (tree_view, tree_view_signals[ROW_EXPANDED], 0, &iter, path);
-  if (open_all)
+  if (open_all && node->children)
     {
       _gtk_rbtree_traverse (node->children,
                             node->children->root,